Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Underwear & Undershirts #575

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Add Underwear & Undershirts #575

wants to merge 8 commits into from

Conversation

TheRealMasterChief117
Copy link
Contributor

Description

Adds underwears and undershirts to the marking menu. They are colorable
You can toggle them ingame with the interactions menu

The sprites are taken from RMC

Media

2025-02-20.17-58-28.mp4

image

Cannot toggle with jumpsuit
image

They are colorable
image

List of markings
image

🆑

  • add: You can now select underwear and undershirts in the markings menu. They are toggleable in-game via the interaction menu, but you must not be wearing a jumpsuit to toggle them.

@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Feb 20, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 20, 2025 •
edited
Loading

RSI Diff Bot; head commit 6c13282 merging into 8f6aa7b
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Floof/Mobs/Customization/undershirt.rsi

State Old New Status
snow_bra Added
snow_sports Added
snow_strapless Added
t_long_undershirt Added
t_rolled_undershirt Added
t_rolled_undershirt_sleeveless Added
t_undershirt Added
t_undershirt_sleeveless Added

Resources/Textures/Floof/Mobs/Customization/underwear.rsi

State Old New Status
snow_boxers Added
snow_briefs Added
snow_lowriders Added
snow_satin Added
snow_tanga Added

Edit: diff updated after 6c13282

Mnemotechnician
Mnemotechnician requested changes Feb 21, 2025
View reviewed changes
Copy link
Collaborator

@Mnemotechnician Mnemotechnician left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, place the new classes and yaml prototypes in floof-specific directories, and add floofstation comments when editing upstream files.

@TheRealMasterChief117
Copy link
Contributor Author

Please, place the new classes and yaml prototypes in floof-specific directories, and add floofstation comments when editing upstream files.

Done, all upstream modifications are now labelled with a comment
Moved the new yaml and C# to floofstation namespaces

Mnemotechnician
Mnemotechnician reviewed Feb 21, 2025
View reviewed changes
Copy link
Collaborator

@Mnemotechnician Mnemotechnician left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, the idea of using interaction verbs for this is pretty clever. I dislike the idea of using markings as clothing due to how rigid they are, but that is compensated by them being togglable IC.

However, I think those markings should be optional OR include some empty option, because plenty of people would want just that (we have thongs, loin-cloths, and other similar options that would work... sub-optimally with those markings underneath).

@TheRealMasterChief117
Copy link
Contributor Author

The undershirt rn is optional just not the underwear, can change it though

@Mnemotechnician
Copy link
Collaborator

The undershirt rn is optional just not the underwear, can change it though

Would be nice to have both optional

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mnemotechnician Mnemotechnician Mnemotechnician requested changes

@Fansana Fansana Awaiting requested review from Fansana Fansana is a code owner

@Memeji Memeji Awaiting requested review from Memeji Memeji is a code owner

@FoxxoTrystan FoxxoTrystan Awaiting requested review from FoxxoTrystan FoxxoTrystan is a code owner

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@TheRealMasterChief117 @Mnemotechnician